From 160bfb4e1c46650488ce2235c0a8014ebe7f4e87 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 28 Jul 2006 17:25:20 +0100 Subject: [PATCH] [LINUX] update_va_mapping multicalls: Use MULTI_UVMxxx_INDEX where possible. Signed-off-by: Jan Beulich --- .../include/asm-i386/mach-xen/asm/hypervisor.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h index 29b7b26807..38378554af 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h @@ -187,16 +187,14 @@ MULTI_update_va_mapping( mcl->args[0] = va; #if defined(CONFIG_X86_64) mcl->args[1] = new_val.pte; - mcl->args[2] = flags; #elif defined(CONFIG_X86_PAE) mcl->args[1] = new_val.pte_low; mcl->args[2] = new_val.pte_high; - mcl->args[3] = flags; #else mcl->args[1] = new_val.pte_low; mcl->args[2] = 0; - mcl->args[3] = flags; #endif + mcl->args[MULTI_UVMFLAGS_INDEX] = flags; } static inline void @@ -208,19 +206,15 @@ MULTI_update_va_mapping_otherdomain( mcl->args[0] = va; #if defined(CONFIG_X86_64) mcl->args[1] = new_val.pte; - mcl->args[2] = flags; - mcl->args[3] = domid; #elif defined(CONFIG_X86_PAE) mcl->args[1] = new_val.pte_low; mcl->args[2] = new_val.pte_high; - mcl->args[3] = flags; - mcl->args[4] = domid; #else mcl->args[1] = new_val.pte_low; mcl->args[2] = 0; - mcl->args[3] = flags; - mcl->args[4] = domid; #endif + mcl->args[MULTI_UVMFLAGS_INDEX] = flags; + mcl->args[MULTI_UVMDOMID_INDEX] = domid; } #endif /* __HYPERVISOR_H__ */ -- 2.30.2